St: fix allocation to not use both wfh and hfw

Passing an explicit width in the wfh case or a height in the hfw case
messes up the request caching, and confuses actors that assume they
won't be called with an explicit width/height unless they're being
allocated along the other axis.

https://bugzilla.gnome.org/show_bug.cgi?id=618295

diff --git a/src/st/st-private.c b/src/st/st-private.c
index 7586e2b793d1a572ccb7fe340ae226ef97efe9c4..dd64cb889308ecae231eef5d9736db3c3c525dea 100644 (file)
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -155,7 +155,7 @@ _st_allocate_fill (StWidget        *parent,
 
   if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
     {
-      clutter_actor_get_preferred_width (child, available_height,
+      clutter_actor_get_preferred_width (child, -1,
                                          &min_width,
                                          &natural_width);
 
@@ -169,7 +169,7 @@ _st_allocate_fill (StWidget        *parent,
     }
   else
     {
-      clutter_actor_get_preferred_height (child, available_width,
+      clutter_actor_get_preferred_height (child, -1,
                                           &min_height,
                                           &natural_height);